ホーム エスクプローラ ヘルプ
登録 サインイン
Kodo
/
kodo
Watch 2
Star 0
Fork 0

ソースを参照
:art: Typo

huangqimin001 4 年 前
親
0db5a45c90
コミット
10046801d9
共有5 個のファイルを変更した、51 個の追加 と 51 個の削除を含む
差分情報を表示
  1. 2 2
      api/maintenance_point_views.py
  2. 39 39
      api/maintenance_views.py
  3. 4 4
      maintenance/admin.py
  4. 1 1
      requirements.txt
  5. 5 5
      utils/error/errno_utils.py

+ 2 - 2
api/maintenance_point_views.py
ファイルの表示 

@@ -7,7 +7,7 @@ from django_response import response
7 7 
 from paginator import pagination
8 8
9 9 
 from maintenance.models import MaintenacePointInfo
10 
-from utils.error.errno_utils import MaintenacePointStatusCode
10 
+from utils.error.errno_utils import MaintenancePointStatusCode
11 11
12 12
13 13 
 @logit
 
@@ -44,7 +44,7 @@ def maintenance_point_update(request):
44 44 
     try:
45 45 
         point = MaintenacePointInfo.objects.get(id=point_id)
46 46 
     except MaintenacePointInfo.DoesNotExist:
47 
-        return response(MaintenacePointStatusCode.MAINTENACE_POINT_NOT_FOUND)
47 
+        return response(MaintenancePointStatusCode.MAINTENACE_POINT_NOT_FOUND)
48 48
49 49 
     if name:
50 50 
         point.name = name

+ 39 - 39
api/maintenance_views.py
ファイルの表示 

@@ -9,7 +9,7 @@ from paginator import pagination
9 9
10 10 
 from maintenance.models import MaintenaceInfo
11 11 
 from utils.admin_utils import is_maintenanceman, is_admin
12 
-from utils.error.errno_utils import MaintenaceStatusCode
12 
+from utils.error.errno_utils import MaintenanceStatusCode
13 13
14 14
15 15 
 @logit
 
@@ -26,9 +26,9 @@ def maintenance_add(request):
26 26 
     point_name = request.POST.get('point_name', '')
27 27 
     express_name = request.POST.get('express_name', '')
28 28 
     tracking_number = request.POST.get('tracking_number', '')
29 
-    maintenace_status = request.POST.get('maintenace_status', '')
29 
+    maintenance_status = request.POST.get('maintenace_status', '')
30 30
31 
-    maintenace = MaintenaceInfo.objects.create(
31 
+    maintenance = MaintenaceInfo.objects.create(
32 32 
         user_id=user_id,
33 33 
         name=name,
34 34 
         phone=phone,
 
@@ -41,11 +41,11 @@ def maintenance_add(request):
41 41 
         point_name=point_name,
42 42 
         express_name=express_name,
43 43 
         tracking_number=tracking_number,
44 
-        maintenace_status=maintenace_status,
44 
+        maintenace_status=maintenance_status,
45 45 
     )
46 46
47 47 
     return response(data={
48 
-        'maintenance_id': maintenace.id,
48 
+        'maintenance_id': maintenance.id,
49 49 
     })
50 50
51 51 
 
@@ -56,15 +56,15 @@ def maintenance_delete(request):
56 56 
     user_id = request.POST.get('user_id', '')
57 57
58 58 
     try:
59 
-        maintenace = MaintenaceInfo.objects.get(id=maintenance_id, status=True)
59 
+        maintenance = MaintenaceInfo.objects.get(id=maintenance_id, status=True)
60 60 
     except MaintenaceInfo.DoesNotExist:
61 
-        return response(MaintenaceStatusCode.MAINTENACE_NOT_FOUND)
61 
+        return response(MaintenanceStatusCode.MAINTENACE_NOT_FOUND)
62 62
63 
-    if user_id != maintenace.user_id and not is_maintenanceman(brand_id, user_id):
64 
-        return response(MaintenaceStatusCode.MAINTENACE_PERMISSION_DENIED)
63 
+    if user_id != maintenance.user_id and not is_maintenanceman(brand_id, user_id):
64 
+        return response(MaintenanceStatusCode.MAINTENACE_PERMISSION_DENIED)
65 65
66 
-    maintenace.status = False
67 
-    maintenace.save()
66 
+    maintenance.status = False
67 
+    maintenance.save()
68 68
69 69 
     return response()
70 70 
 
@@ -86,41 +86,41 @@ def maintenance_update(request):
86 86 
     tracking_number = request.POST.get('tracking_number', '')
87 87 
     back_express_name = request.POST.get('back_express_name', '')
88 88 
     back_tracking_number = request.POST.get('back_tracking_number', '')
89 
-    maintenace_status = request.POST.get('maintenace_status', '')
89 
+    maintenance_status = request.POST.get('maintenace_status', '')
90 90
91 91 
     try:
92 
-        maintenace = MaintenaceInfo.objects.get(id=maintenance_id, status=True)
92 
+        maintenance = MaintenaceInfo.objects.get(id=maintenance_id, status=True)
93 93 
     except MaintenaceInfo.DoesNotExist:
94 
-        return response(MaintenaceStatusCode.MAINTENACE_NOT_FOUND)
94 
+        return response(MaintenanceStatusCode.MAINTENACE_NOT_FOUND)
95 95
96 
-    if user_id != maintenace.user_id and not is_admin(brand_id, admin_id):
97 
-        return response(MaintenaceStatusCode.MAINTENACE_PERMISSION_DENIED)
96 
+    if user_id != maintenance.user_id and not is_admin(brand_id, admin_id):
97 
+        return response(MaintenanceStatusCode.MAINTENACE_PERMISSION_DENIED)
98 98
99 99 
     if name:
100 
-        maintenace.name = name
100 
+        maintenance.name = name
101 101 
     if phone:
102 
-        maintenace.phone = phone
102 
+        maintenance.phone = phone
103 103 
     if address:
104 
-        maintenace.address = address
104 
+        maintenance.address = address
105 105 
     if sn:
106 
-        maintenace.sn = sn
106 
+        maintenance.sn = sn
107 107 
     if desc:
108 
-        maintenace.desc = desc
108 
+        maintenance.desc = desc
109 109 
     if point_id:
110 
-        maintenace.point_id = point_id
110 
+        maintenance.point_id = point_id
111 111 
     if point_name:
112 
-        maintenace.point_name = point_name
112 
+        maintenance.point_name = point_name
113 113 
     if express_name:
114 
-        maintenace.express_name = express_name
114 
+        maintenance.express_name = express_name
115 115 
     if tracking_number:
116 
-        maintenace.tracking_number = tracking_number
116 
+        maintenance.tracking_number = tracking_number
117 117 
     if back_express_name:
118 
-        maintenace.back_express_name = back_express_name
118 
+        maintenance.back_express_name = back_express_name
119 119 
     if back_tracking_number:
120 
-        maintenace.back_tracking_number = back_tracking_number
121 
-    if maintenace_status:
122 
-        maintenace.maintenace_status = maintenace_status
123 
-    maintenace.save()
120 
+        maintenance.back_tracking_number = back_tracking_number
121 
+    if maintenance_status:
122 
+        maintenance.maintenace_status = maintenance_status
123 
+    maintenance.save()
124 124
125 125 
     return response()
126 126 
 
@@ -133,16 +133,16 @@ def maintenance_list(request):
133 133 
     page = request.POST.get('page', 1)
134 134 
     num = request.POST.get('num', 20)
135 135
136 
-    maintenaces = MaintenaceInfo.objects.filter(status=True)
136 
+    maintenances = MaintenaceInfo.objects.filter(status=True)
137 137 
     if not is_admin(brand_id, admin_id):
138 
-        maintenaces = maintenaces.filter(user_id=user_id)
138 
+        maintenances = maintenances.filter(user_id=user_id)
139 139
140 
-    count = maintenaces.count()
141 
-    maintenaces = [maintenace.data for maintenace in maintenaces]
142 
-    maintenaces, left = pagination(maintenaces, page, num)
140 
+    count = maintenances.count()
141 
+    maintenances = [maintenance.data for maintenance in maintenances]
142 
+    maintenances, left = pagination(maintenances, page, num)
143 143
144 144 
     return response(data={
145 
-        'maintenaces': maintenaces,
145 
+        'maintenaces': maintenances,
146 146 
         'count': count,
147 147 
         'left': left,
148 148 
     })
 
@@ -153,10 +153,10 @@ def maintenance_detail(request):
153 153 
     maintenance_id = request.POST.get('maintenance_id', '')
154 154
155 155 
     try:
156 
-        maintenace = MaintenaceInfo.objects.get(id=maintenance_id, status=True)
156 
+        maintenance = MaintenaceInfo.objects.get(id=maintenance_id, status=True)
157 157 
     except MaintenaceInfo.DoesNotExist:
158 
-        return response(MaintenaceStatusCode.MAINTENACE_NOT_FOUND)
158 
+        return response(MaintenanceStatusCode.MAINTENACE_NOT_FOUND)
159 159
160 160 
     return response(data={
161 
-        'maintenace': maintenace.data,
161 
+        'maintenace': maintenance.data,
162 162 
     })

+ 4 - 4
maintenance/admin.py
ファイルの表示 

@@ -5,7 +5,7 @@ from django.contrib import admin
5 5 
 from maintenance.models import ExpressCompanyInfo, MaintenaceInfo, MaintenacePointInfo
6 6
7 7
8 
-class MaintenacePointInfoAdmin(admin.ModelAdmin):
8 
+class MaintenancePointInfoAdmin(admin.ModelAdmin):
9 9 
     list_display = ('name', 'province', 'location', 'postcode', 'status', 'created_at', 'updated_at')
10 10
11 11 
 
@@ -13,10 +13,10 @@ class ExpressCompanyInfoAdmin(admin.ModelAdmin):
13 13 
     list_display = ('name', 'status', 'created_at', 'updated_at')
14 14
15 15
16 
-class MaintenaceInfoAdmin(admin.ModelAdmin):
16 
+class MaintenanceInfoAdmin(admin.ModelAdmin):
17 17 
     list_display = ('user_id', 'name', 'phone', 'address', 'sn', 'desc', 'point_id', 'point_name', 'express_name', 'tracking_number', 'back_express_name', 'back_tracking_number', 'maintenace_status', 'status', 'created_at', 'updated_at')
18 18
19 19
20 
-admin.site.register(MaintenacePointInfo, MaintenacePointInfoAdmin)
20 
+admin.site.register(MaintenacePointInfo, MaintenancePointInfoAdmin)
21 21 
 admin.site.register(ExpressCompanyInfo, ExpressCompanyInfoAdmin)
22 
-admin.site.register(MaintenaceInfo, MaintenaceInfoAdmin)
22 
+admin.site.register(MaintenaceInfo, MaintenanceInfoAdmin)

+ 1 - 1
requirements.txt
ファイルの表示 

@@ -1,5 +1,5 @@
1 1 
 CodeConvert==3.0.2
2 
-Pillow==8.3.1
2 
+Pillow==8.3.2
3 3 
 StatusCode==1.0.0
4 4 
 TimeConvert==1.6.0
5 5 
 furl==2.1.2

+ 5 - 5
utils/error/errno_utils.py
ファイルの表示 

@@ -108,9 +108,9 @@ class MarketCodeStatusCode(BaseStatusCode):
108 108 
     MARKET_CODE_NOT_FOUND = StatusCodeField(505001, 'Market Code Not Found', description=u'一物一码不存在')
109 109
110 110
111 
-class MaintenacePointStatusCode(BaseStatusCode):
111 
+class MaintenancePointStatusCode(BaseStatusCode):
112 112 
     """ 维修点相关错误码 5060xx """
113 
-    MAINTENACE_POINT_NOT_FOUND = StatusCodeField(506001, 'Maintenace Point Not Found', description=u'维修点不存在')
113 
+    MAINTENACE_POINT_NOT_FOUND = StatusCodeField(506001, 'Maintenance Point Not Found', description=u'维修点不存在')
114 114
115 115
116 116 
 class ExpressStatusCode(BaseStatusCode):
 
@@ -118,10 +118,10 @@ class ExpressStatusCode(BaseStatusCode):
118 118 
     EXPRESS_NOT_FOUND = StatusCodeField(507001, 'Express Not Found', description=u'快递公司不存在')
119 119
120 120
121 
-class MaintenaceStatusCode(BaseStatusCode):
121 
+class MaintenanceStatusCode(BaseStatusCode):
122 122 
     """ 维修相关错误码 5080xx """
123 
-    MAINTENACE_NOT_FOUND = StatusCodeField(508001, 'Maintenace Not Found', description=u'维修不存在')
124 
-    MAINTENACE_PERMISSION_DENIED = StatusCodeField(508002, 'Maintenace Permission Denied', description=u'维修权限不足')
123 
+    MAINTENACE_NOT_FOUND = StatusCodeField(508001, 'Maintenance Not Found', description=u'维修不存在')
124 
+    MAINTENACE_PERMISSION_DENIED = StatusCodeField(508002, 'Maintenance Permission Denied', description=u'维修权限不足')
125 125
126 126
127 127 
 class AdministratorStatusCode(BaseStatusCode):